Upgrade spring to 1.3.2 and undo our local patch.
Akinori MUSHA
3 changed files with 8 additions and 13 deletions
+ 1
- 1
Gemfile
@@ -106,7 +106,7 @@ group :development, :test do |
||
| 106 | 106 |
gem 'rspec-rails', '~> 3.0.1' |
| 107 | 107 |
gem 'rspec-html-matchers', '~> 0.6.1' |
| 108 | 108 |
gem 'shoulda-matchers' |
| 109 |
- gem 'spring' |
|
| 109 |
+ gem 'spring', '~> 1.3.2' |
|
| 110 | 110 |
gem 'spring-commands-rspec' |
| 111 | 111 |
gem 'vcr' |
| 112 | 112 |
gem 'webmock', '~> 1.17.4', require: false |
+ 2
- 2
Gemfile.lock
@@ -364,7 +364,7 @@ GEM |
||
| 364 | 364 |
slop (3.6.0) |
| 365 | 365 |
spectrum-rails (1.3.4) |
| 366 | 366 |
railties (>= 3.1) |
| 367 |
- spring (1.1.3) |
|
| 367 |
+ spring (1.3.2) |
|
| 368 | 368 |
spring-commands-rspec (1.0.2) |
| 369 | 369 |
spring (>= 0.9.1) |
| 370 | 370 |
sprockets (2.11.0) |
@@ -517,7 +517,7 @@ DEPENDENCIES |
||
| 517 | 517 |
shoulda-matchers |
| 518 | 518 |
slack-notifier (~> 1.0.0) |
| 519 | 519 |
spectrum-rails |
| 520 |
- spring |
|
| 520 |
+ spring (~> 1.3.2) |
|
| 521 | 521 |
spring-commands-rspec |
| 522 | 522 |
string-scrub |
| 523 | 523 |
therubyracer (~> 0.12.1) |
+ 5
- 10
bin/spring
@@ -1,20 +1,15 @@ |
||
| 1 | 1 |
#!/usr/bin/env ruby |
| 2 | 2 |
|
| 3 |
-# This file loads spring without using Bundler, in order to be fast |
|
| 4 |
-# It gets overwritten when you run the `spring binstub` command |
|
| 3 |
+# This file loads spring without using Bundler, in order to be fast. |
|
| 4 |
+# It gets overwritten when you run the `spring binstub` command. |
|
| 5 | 5 |
|
| 6 | 6 |
unless defined?(Spring) |
| 7 | 7 |
require "rubygems" |
| 8 | 8 |
require "bundler" |
| 9 | 9 |
|
| 10 |
- case lockfile = Bundler.default_lockfile.read |
|
| 11 |
- when /^GEM$.*?^ spring \((.*?)\)$.*?^$/m |
|
| 12 |
- version = $1 |
|
| 13 |
- ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR) |
|
| 14 |
- ENV["GEM_HOME"] = "" unless /^GIT$/ === lockfile |
|
| 15 |
- Gem.paths = ENV |
|
| 16 |
- |
|
| 17 |
- gem "spring", version |
|
| 10 |
+ if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m) |
|
| 11 |
+ Gem.paths = { "GEM_PATH" => Bundler.bundle_path.to_s }
|
|
| 12 |
+ gem "spring", match[1] |
|
| 18 | 13 |
require "spring/binstub" |
| 19 | 14 |
end |
| 20 | 15 |
end |